Do not allow jj init --git in existing Git repo
#2641
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chriskrycho
force-pushed
the
push-xvnszvpvwvnp
branch
2 times, most recently
from
297909c to
6a41bfb
Compare
chriskrycho
force-pushed
the
push-xvnszvpvwvnp
branch
from
6a41bfb to
b8471b9
Compare
PhilipMetzger
approved these changes
Nov 27, 2023
Allowing `jj init --git` in an existing Git repo creates a second Git store in `.jj/repo/store/git`, totally disconnected from the existing Git store. This will only produce extremely confusing bugs for users, since any operations they make in Git will *not* be reflected in the jj repo.
chriskrycho
force-pushed
the
push-xvnszvpvwvnp
branch
from
b8471b9 to
763a9b0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allowing
jj init --gitin an existing Git repo creates a second Git store in.jj/repo/store/git, totally disconnected from the existing Git store. This will only produce extremely confusing bugs for users, since any operations they make in Git will not be reflected in the jj repo.Note: this is a tweak to the behavior as originally implemented in #687.
Checklist
If applicable:
CHANGELOG.mdI have updated the documentation (README.md, docs/, demos/)I have updated the config schema (cli/src/config-schema.json)